Fix the remaining issues that broke the PLT check

Add internal API for the default button box layouts to so we don't
need to call deprectated GTK+ functions (which are invisible with
GTK_DISABLE_DEPRECATED).

diff --git a/gtk/gtkbbox.c b/gtk/gtkbbox.c
index 245fa3c0068a3cee76e21e912983f52656397e34..3690a6b62c3eb05c5dcc966aa6df431ef0bb998d 100644 (file)
--- a/gtk/gtkbbox.c
+++ b/gtk/gtkbbox.c
@@ -493,9 +493,9 @@ gtk_button_box_kludge_get_layout_default (GtkButtonBox *widget)
   orientation = gtk_orientable_get_orientation (GTK_ORIENTABLE (widget));
 
   if (orientation == GTK_ORIENTATION_HORIZONTAL)
-    return gtk_hbutton_box_get_layout_default ();
+    return _gtk_hbutton_box_get_layout_default ();
   else
-    return gtk_vbutton_box_get_layout_default ();
+    return _gtk_vbutton_box_get_layout_default ();
 }
 
 static void

diff --git a/gtk/gtkhbbox.c b/gtk/gtkhbbox.c
index ea9c1f843b3017064e555eca586c0333a7e3ddbb..50131d1ea1d9ba5931991fdaa34fa297d2cdf38b 100644 (file)
--- a/gtk/gtkhbbox.c
+++ b/gtk/gtkhbbox.c
@@ -92,5 +92,11 @@ gtk_hbutton_box_get_layout_default (void)
   return default_layout_style;
 }
 
+GtkButtonBoxStyle
+_gtk_hbutton_box_get_layout_default (void)
+{
+  return default_layout_style;
+}
+
 #define __GTK_HBUTTON_BOX_C__
 #include "gtkaliasdef.c"

diff --git a/gtk/gtkhbbox.h b/gtk/gtkhbbox.h
index 65d6df975a9b64ed8a449d5c70dd995d5697f1e2..25eecba10679c1044ec0e3caa767db937dea64a8 100644 (file)
--- a/gtk/gtkhbbox.h
+++ b/gtk/gtkhbbox.h
@@ -72,6 +72,9 @@ void gtk_hbutton_box_set_spacing_default (gint spacing);
 void gtk_hbutton_box_set_layout_default (GtkButtonBoxStyle layout);
 #endif
 
+/* private API */
+GtkButtonBoxStyle _gtk_hbutton_box_get_layout_default (void);
+
 G_END_DECLS
 
 #endif /* __GTK_HBUTTON_BOX_H__ */

diff --git a/gtk/gtkvbbox.c b/gtk/gtkvbbox.c
index 0f9262171e177f9e4250500031a826b62bef9d1b..72ba3851b5ba145ba62284a7634e294e286fa1bd 100644 (file)
--- a/gtk/gtkvbbox.c
+++ b/gtk/gtkvbbox.c
@@ -94,5 +94,12 @@ gtk_vbutton_box_get_layout_default (void)
   return default_layout_style;
 }
 
+GtkButtonBoxStyle
+_gtk_vbutton_box_get_layout_default (void)
+{
+  return default_layout_style;
+}
+
+
 #define __GTK_VBBOX_C__
 #include "gtkaliasdef.c"

diff --git a/gtk/gtkvbbox.h b/gtk/gtkvbbox.h
index 901bc709a7cf670a95b6695370199176ca919d72..996eb57a6026fd8c7d733d246ef5611a315c4bf8 100644 (file)
--- a/gtk/gtkvbbox.h
+++ b/gtk/gtkvbbox.h
@@ -73,6 +73,8 @@ GtkButtonBoxStyle gtk_vbutton_box_get_layout_default (void);
 void gtk_vbutton_box_set_layout_default (GtkButtonBoxStyle layout);
 #endif
 
+/* private API */
+GtkButtonBoxStyle _gtk_vbutton_box_get_layout_default (void);
 
 G_END_DECLS